From 08b22ddebf7d47062c6670dfca90915d52f02e75 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 22 Dec 1998 22:00:43 +0000 Subject: [PATCH] Request XmTRANFER_FAILURE on Motif drops not within a drop zone. I don't Tue Dec 22 17:01:43 1998 Owen Taylor * gtk/gtkdnd.c (gtk_drag_dest_handle_event): Request XmTRANFER_FAILURE on Motif drops not within a drop zone. I don't know why this is necessary, but it is. * gdk/gdkdnd.c (gdk_drop_reply): Fixed error where Motif flag field in response was getting wrong values. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gdk/gdkdnd.c | 4 ++-- gdk/x11/gdkdnd-x11.c | 4 ++-- gtk/gtkdnd.c | 6 +++++- 10 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d3f601f7e..921525fc33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Dec 22 17:01:43 1998 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_handle_event): + Request XmTRANFER_FAILURE on Motif drops not within + a drop zone. I don't know why this is necessary, + but it is. + + * gdk/gdkdnd.c (gdk_drop_reply): Fixed error where + Motif flag field in response was getting wrong + values. + Tue Dec 22 15:55:39 1998 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4d3f601f7e..921525fc33 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Tue Dec 22 17:01:43 1998 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_handle_event): + Request XmTRANFER_FAILURE on Motif drops not within + a drop zone. I don't know why this is necessary, + but it is. + + * gdk/gdkdnd.c (gdk_drop_reply): Fixed error where + Motif flag field in response was getting wrong + values. + Tue Dec 22 15:55:39 1998 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4d3f601f7e..921525fc33 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Tue Dec 22 17:01:43 1998 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_handle_event): + Request XmTRANFER_FAILURE on Motif drops not within + a drop zone. I don't know why this is necessary, + but it is. + + * gdk/gdkdnd.c (gdk_drop_reply): Fixed error where + Motif flag field in response was getting wrong + values. + Tue Dec 22 15:55:39 1998 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4d3f601f7e..921525fc33 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Tue Dec 22 17:01:43 1998 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_handle_event): + Request XmTRANFER_FAILURE on Motif drops not within + a drop zone. I don't know why this is necessary, + but it is. + + * gdk/gdkdnd.c (gdk_drop_reply): Fixed error where + Motif flag field in response was getting wrong + values. + Tue Dec 22 15:55:39 1998 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4d3f601f7e..921525fc33 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Tue Dec 22 17:01:43 1998 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_handle_event): + Request XmTRANFER_FAILURE on Motif drops not within + a drop zone. I don't know why this is necessary, + but it is. + + * gdk/gdkdnd.c (gdk_drop_reply): Fixed error where + Motif flag field in response was getting wrong + values. + Tue Dec 22 15:55:39 1998 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4d3f601f7e..921525fc33 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Tue Dec 22 17:01:43 1998 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_handle_event): + Request XmTRANFER_FAILURE on Motif drops not within + a drop zone. I don't know why this is necessary, + but it is. + + * gdk/gdkdnd.c (gdk_drop_reply): Fixed error where + Motif flag field in response was getting wrong + values. + Tue Dec 22 15:55:39 1998 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4d3f601f7e..921525fc33 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Tue Dec 22 17:01:43 1998 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_handle_event): + Request XmTRANFER_FAILURE on Motif drops not within + a drop zone. I don't know why this is necessary, + but it is. + + * gdk/gdkdnd.c (gdk_drop_reply): Fixed error where + Motif flag field in response was getting wrong + values. + Tue Dec 22 15:55:39 1998 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index 9c088cbc62..0578a81089 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -2852,12 +2852,12 @@ gdk_drop_reply (GdkDragContext *context, xev.xclient.data.b[0] = XmDROP_START | 0x80; xev.xclient.data.b[1] = local_byte_order; if (ok) - xev.xclient.data.s[2] = XmDROP_COPY | + xev.xclient.data.s[1] = XmDROP_COPY | (XmDROP_SITE_VALID << 4) | (XmDROP_NOOP << 8) | (XmDROP << 12); else - xev.xclient.data.s[2] = XmDROP_NOOP | + xev.xclient.data.s[1] = XmDROP_NOOP | (XmNO_DROP_SITE << 4) | (XmDROP_NOOP << 8) | (XmDROP_CANCEL << 12); diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 9c088cbc62..0578a81089 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -2852,12 +2852,12 @@ gdk_drop_reply (GdkDragContext *context, xev.xclient.data.b[0] = XmDROP_START | 0x80; xev.xclient.data.b[1] = local_byte_order; if (ok) - xev.xclient.data.s[2] = XmDROP_COPY | + xev.xclient.data.s[1] = XmDROP_COPY | (XmDROP_SITE_VALID << 4) | (XmDROP_NOOP << 8) | (XmDROP << 12); else - xev.xclient.data.s[2] = XmDROP_NOOP | + xev.xclient.data.s[1] = XmDROP_NOOP | (XmNO_DROP_SITE << 4) | (XmDROP_NOOP << 8) | (XmDROP_CANCEL << 12); diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 68379c9583..1aa4bbcbc2 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -896,7 +896,11 @@ gtk_drag_dest_handle_event (GtkWidget *toplevel, gdk_drag_status (context, 0, event->dnd.time); } else if (event->type == GDK_DROP_START) - gdk_drop_reply (context, data.found, event->dnd.time); + { + gdk_drop_reply (context, data.found, event->dnd.time); + if (context->protocol == GDK_DRAG_PROTO_MOTIF) + gtk_drag_finish (context, FALSE, FALSE, event->dnd.time); + } } break; -- 2.30.2